From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 20:51:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d4082b3d476bb73173680e6bdb361a90f9e6067c;p=emacs.git

merge from trunk
---

d4082b3d476bb73173680e6bdb361a90f9e6067c